Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Sep 2011 18:18:16 +0000 (11:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 13 Sep 2011 18:18:16 +0000 (11:18 -0700)

Trivial merge